# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/08/04 08:40:21-06:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/ia64-extras
#   into hp.com:/home/helgaas/linux/linux-ia64-2.4
# 
# fs/proc/proc_misc.c
#   2004/08/04 08:40:18-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# fs/proc/base.c
#   2004/08/04 08:40:18-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/char/mem.c
#   2004/08/04 08:40:18-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Makefile
#   2004/08/04 08:40:17-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Documentation/Configure.help
#   2004/08/04 08:40:17-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/08/04 08:38:55-06:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/linux-2.4
#   into hp.com:/home/helgaas/linux/ia64-extras
# 
# fs/proc/proc_misc.c
#   2004/08/04 08:38:53-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# fs/proc/base.c
#   2004/08/04 08:38:53-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/char/mem.c
#   2004/08/04 08:38:53-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Makefile
#   2004/08/04 08:38:52-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Documentation/Configure.help
#   2004/08/04 08:38:52-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
#